(functionp): Catch errors in indirect-function.

diff --git a/lisp/subr.el b/lisp/subr.el
index e7fbe0f6a7b664f005d8bd45a3106c3650350de5..2636ccadea97ccffdca717aa3c2d0f603024ab5a 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1804,7 +1804,9 @@ configuration."
 (defun functionp (object)
   "Non-nil iff OBJECT is a type of object that can be called as a function."
   (or (and (symbolp object) (fboundp object)
-          (setq object (indirect-function object))
+          (condition-case nil
+              (setq object (indirect-function object))
+            (error nil))
           (eq (car-safe object) 'autoload)
           (not (car-safe (cdr-safe (cdr-safe (cdr-safe (cdr-safe object)))))))
       (subrp object) (byte-code-function-p object)